Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 18 Jul 2010 22:30:24 +0000 (22:30 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 18 Jul 2010 22:30:24 +0000 (22:30 +0000)

Trivial merge